Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 10 Jun 2014 14:11:04 +0000 (15:11 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 10 Jun 2014 14:11:04 +0000 (15:11 +0100)
commit38d4393462ad766fd10313f323a329be29a2f58e
treea83f88d1a98f01cc479a5ac9ae8b5307ef7dd633
parent92f962f4a72f297a0e21bf1acbea4a685a487fc7
parentb6100a6cd5b9ff6de07726e3acf744454926c962
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging